16: UI enhancements to further come closer to specifications.  A lot of cleanup.