Merge jstockwin/settingsLayout