GUI Stuff II/ Bug Fixes