Redo the layout

Change the layout as an preperation for the new look of application.