Fix a few page issues.
Merge branch 'development'