Merge pull request #1 from prolific8/redesign

Redesign