DS-438 Refactor register form display to simplify