moving some stuff to stylesheets, and other bits to general code