Adding a generic page and tidying