Major change on design and top canvas