Neaten up appearance in both display modes.