Menu fix + controls update