Feature/feature widgets all merges