Top navigation functionality update (not 100%)
Merge pull request #59 from mierze/master

Top navigation functionality update (not 100%)