Add extra hints and modify the page layout