Updated Gui - still in progress