refactoring, clean-up, simpler view mechanism, files and documents vs pages and contents, regexp bug
fix conflict