More Organization of Menu