Reorganize dashboard
Update todo