Category spinner not enhanced, add formatting.
Merge branch 'BIRD-67' of https://github.com/catalystbirdapp/BirdApp into BIRD-67