Overhauled the page