some more style fixes and reordered some index content