New design on dev branch
Refactoring