Fixes to pagetree, split up controllers