Add invisibles formatting and other changes