Gui changes + logic changes