Revert "Revert "Highlight current selected view in Navigationbar""

This reverts commit 7cb35d7fd74ce689ee278220bf4538deb6761001.