Gilbert-reviewed changes. Fixed indentation, fixed CSS naming conventions, fixed HTML naming conventions