Re-organised todo list