Various changes in the GUI layout