Reorder stuff in todo