some changes in design
Merge pull request #80 from bionic-university/feature/design

some changes in design