Update TODOv2

+ Working on UI