Continued cleaning of markup, addition of styles