Revert "Feature/design"
Merge pull request #36 from sikmi/revert-35-feature/design

Revert "Feature/design"