- added FactoryWorkers back
- View cleanups