Minor cleanup in GUI/Main