Lots of templates refactoring including navbar and translations
Merge remote-tracking branch 'origin/master'