Added templates, navigation