style files restructured, varoius style fixes