Fixed some issues with formatting options becoming "dirty" unnecessarily.
Some improvements to formatting options fix.