layout
Merge branch 'dev' into developer/davidsingal

* dev:
  styles
  main content
  main-content
  styles
filtered
Merge branch 'developer/davidsingal' into dev

* developer/davidsingal:
  filtered
  layout