just poking at some styling and layouts
added button bar for nav
Merge branch 'style'