More changes! Please test and give feedback
Merge pull request #21 from KB50-G1/feature/design-refactoring

More changes! Please test and give feedback