Modular: Gui: reworked factory layout