GUI fix to welcome message options (also minor code cleanup)