Menu dropdown, new template and corrections