Continuing work on registration screen