Styles now injected into single style element, made some formatting and other minor changes