Checkpoint - changing all sites to new layout
All templates updated
committing now look good