* Fix: crash on saving preferences
some cosmetic changes