Updated the GUI (still WIP though)