Modified HTML markup, simplified CSS