Improvements for GUI