Cleaned up menu listing