Pages controller
merge 2 our branch