Minor redesign
Merge pull request #2 from rafaelconde/redesign

Minor redesign