formatting changes
merged to mac
fixed html formatting