Rearranged extra settings to avoid clutter