Preparation for the new headers
Some of the improvements
Sorry, I'm just not into pagination