re-design
Merge pull request #11 from Dipress/task/redesign

re-design