New menu part 2 (WIP)