Refactoring page views
Merging changes
General fixes