Design ammends

Fixes for issues found in design review