[artf661145] framework refactoring for widgetisation