fixed some design stuff
Merge pull request #2 from futurice/cleanup

fixed some design stuff