Display classes as "tags", small layout changes