Merge "Style changes in Select template"