Finalized the design
Updated the final design