[IMPROVEMENT][CLOSES #7] Options UserControls