tweaks and bug fixes to Resident Pages - ready for review