navigation improvements, improved data correction paging