init pages
merge with master
fix merge
style changes, footer fixes