Small design updates
Merged master & solved conflicts
Merge pull request #10 from gbbr/revamp

Small design updates