Changes to GUI, making a new layout and starting to move the code.