Bug fixes - on/off state preservation; remove bg page