Overhauled menu working