Class fix, and removed extra DIV