Update of design, using grunt now