More GUI Fixes