cleaned up menu