html clean up and adjustments