Refactor Registration UI