Rework on option page