commit 2

new nav
and layout