Added paginator
Minor style fixes