Added menu templating and updated multiple states