Small design&flow enhancements.

Summary moved to solutions#index.
Merge branch 'small-design-enhancements'