Layout NavigationBar
Merge branch 'master' of github.com:Slesa/Poseidon