Fixed GUI Bugs