GUI Bugs fixed