Refactored Navigation #59
Refactored Navigation #59 - round 2
Refactored Navigation #59 - round 3
Merge pull request #69 from WooDzu/0.5.0-nav

Refactored Navigation #59