Get rid of the separate "Main settings", put them in the System Settings category instead.