Improvements in the GUI