Improve task listing