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

The changes are focused on the code, some of the styling has been lost and will need to be readdressed by Chris and Alex post merge.