Merge pull request #10 from yhordi/redesign

Redesign