GUI Improvements and fixes