design changes
Merge pull request #13 from kataviz/KatDev

design changes