MD changes from design review and functionality bits 2/7
MD updates from 2/7 design review