FLUID-4686: Updated and simplified UIOptions store grade.

This is an early pull request to get some initial feedback.