Minor improvement in main GUI class