Made some changes to the GUI layout