Worked a little bit on the GUI