Revamped the whole page