Any Author
This also makes the settings panel 2 pane. Change-Id: Ifccfdc145065fc51f12b74160c797749063b403d