Issue #5 - Updated views with upstream changes for pagination.