Refactor registration views