Improvements of the gui