Formatting improvements for #172
Combined Unit (Animal) stats together for #172