Minor fixes in layout

Updated just a little bit the layout to make all the controls fit in on
single page.