Merge pull request #1 from jbenzshawel/design_changes

Design changes
Merge pull request #2 from jbenzshawel/master

Merge pull request #1 from jbenzshawel/design_changes