Used bootstrap styling for settings form controls.
Merge remote-tracking branch 'upstream/master'