Mostly page and page controller update
merge