Hixed HTML errors; reformatted with Visual Studio
Update for R2-2