draft layouts, nav bar, organization of views through styling
Merge branch 'master' into css-part1