ui rework
fixed remove bug
Merge branch 'master' into todo-edge
todos ui work