Add sign up scenario and fix looks