Added dynamic about pages
Merge conflict fixes