refactor tasks, re-organize UI