Merge change 5984

* changes:
  Update rollo and support functions.  Includes mockup of some new ui concepts.