Navigation block
Merge pull request #2341 from errietta/navigation

Navigation block