Settings dialog merging
Added an .ui file for dialog; Got rid of no longer needed SettingsDialog base class