GUI Improvements
Merge origin/master