Added template overrides, fixed drop down menu