fix navigation hierarchy, use top bar and align controls
Merge pull request #20 from jancborchardt/navigation-hierarchy

fix navigation hierarchy, use top bar and align controls