Some styling and fix pagination