Add neater pagination, and a facility detail popup