finishes navigation and logo
merges ->finishes navigation and logo<- from dev