Fixed a bug with substantial, and fixed setting L&F