cleaning up some design things
Merge branch 'master' of https://github.com/eyuelt/CriSee