improve page & navbar templates