Minor fixes for the UX.
Add todo.
Fix the widget of the up and down.