Improving the layout of the GUI