Implemented final design changes