fix issue #33 and improved settings UI