Fixed paging error + other display issues