Nii - some refactor to move away from public pages and use pages controller