cleanup the look, fix pagination