extensive formatting and static pages
fix merge conflict