ui tasks 1.0
merge