FLUID-4686: Updated and simplified UIOptions store grade, improved model handling between uioptions subcomponents.

This is an early pull request (yet with all tests passing) to get some feedback.