bugfix + litte refactoring fowards to UI change