New menue works
Clean up code
Clean up code