GC{-7674 - UI fixes
Merge branch 'master' of https://github.com/digitalabs/BreedingManager