Design updates

Design updates