Improve display of current page