Changes on design for v2.0

First changes on design for v2.0