OPtions management screen updaets
Merge branch 'develop'