More GUI Improvements