add views for pages
remove page fields
fix conflicts