Swapped pagination footer, module cleanup