same page sync
kirstins changes added
Merge branch 'master' into kirk
do not use this commit
still adjusting css