Merge pull request #1191 from Mesrop/feature/settings

Settings: UI changes.