Improvements to GUI