Bug 931430 - Look at splitting up settings panels.

WIP - do not merge.