Fixed the relations and data pages