upgrade in own activity - code cleanup - reordered preferences