Design Changes

Small design changes