rearranged control items
Merge branch 'styling'