Refactor sign up template