Improved the GUI