Minor GUI (!) improvements !