Settings form in place
Merge branch 'settings_ui' into development