Updated menu templates and controller