Updated design
more design changes