Changes to GUI logic
More change GUI logic