Refactored signup form