GUI Bugs solved