Merge pull request #2 from Alfau/redesign-of-the-redesign

Redesign of the redesign
Merge pull request #3 from Alfau/master

Merge pull request #2 from Alfau/redesign-of-the-redesign