fixed ui widget names & layout

pretty self explanatory.