Couple new templates added, formatting fixes