added horizontal nav bar
Merge branch 'staging'