[Merge] From Unstable Pt5

[Refactored] Pet menu component for stability

Dec 07