cleanup and adjustments for better html/styles