Improvement of the GUI