Began trimming classes and improving HTML5