GUI Improvements and Modifications