Did some more formatting fixes. There are still more to do for options area and elsewhere.