Added entry list paging and refactored, etc.