Problem with page order.
Refactoring regarding order problem.
Fine and dandy.
Cleaning some files.
After merge with original repository.