Fixed some layout issues in the factory
Small improvements to the random fruit generation