MP1-4231 : Fix issue where enable disable wouldn't save
MP1-4231 : Spacing updates