fixed sign-up, more view cleaning