Jordan layout and static pages changed
Syncing files for merge
Fixed a merge conflict