templates/styles cleanup, first pass