Add pages controller
Merge with master