Reindent, add core pager