Improved navigation-bar layout configuration.
Merge pull request #10 from jmmut/feature/gm-fixes

Improved navigation-bar layout configuration.