Fixed several GUI Bugs