progress
new layout
removing old post
Merge branch 'master' into sites/org