More tidying, change password separate page.