Refactored Entity/Form RelationShip/Page