refactored SitePresenter and MatrixGenerationJob handling