Refactored component factories view.
Updated ALL the things!