Fix Add Pet fields, just refactor it all

[Zeepheru]

Changed the if selected checks to add in a Form - and now the ownership section always shows up when a pet category is not selected
Fix that

Actually no just REFACTOR THE WHOLE BLOODY THING

[Zeepheru]

WIP, currently fixed the conditional rendering but may still need a good refactoring