A little re-organisation and boilerplating. Use @extend where appropriate to make the HTML more explicit.