Continuing work on pet edit screen