GUI Improvements
Some further improvements to the user experience