Menu folder overhaul part 2