Fix templates to no longer show double titles