Small GUI and user interface improvements