refactoring artefacts + widgets