Fixed Handlebars error and dup menus