prep for merge
merge fixes
further formatting updates
homepage formatting and earch index