Menu folder overhaul part 1