modified tags, classes & minor fixes