Updated design

Now the main branch has a new design, from this moment all changes will go in this branch.