Simplify/improve HTML/CSS (labels)