More tweaks following CSS optimisation (#5).