Further improve the page