misc design changes - dev

misc changes