Moved paging into it's own element
Updated navigation