Update TO-DO-UI and OTHER