GPII-153 && GPII-187

Updated version of Alex and Chris's work from 
https://github.com/GPII/prefsEditors/pull/6
https://github.com/GPII/prefsEditors/pull/7