work on demos templates, navigation and loops