Menu fix WIP