Cleaned up menu building.