Added todo in ui.js