Main menu and other fix
Merge
fucking merge