Update of the GUI. I'm yet to finish this though