Fixing minor display/paging issues