Reworked links, main template
Merge pull request #25 from ArcBees/aw_9_rework_nav

ADEV-9 Reworked links, main template