Remove 'done' column and gather using tag contents
Improve labels and layouts