Fixes to page controller