Added aggregation-level menu system and separate results menu