Here's where I moved the menu, sorry about the last commit