Refactor SettingPanelBuilder