added button group and select
mostly done
Merge remote-tracking branch 'origin/master'