DEP-28 Website template fixes