Refactoring into a model
More links between pages
Added support for Tags