Fixes to paging, misc. style changes.