Adding some resuable classes and some markup changes.