Implemented more of the GUI