Added select option back
Merge branch 'layout' of github.com:jacky5283/feelsion into layout
edited layout