Gui updates and fixes for logic