Better pagination , and fix for stuff