A bit of refactoring, + pages creation and editing