more sensible classes and markup