Re-design (un)watched marks, improve grid views