Merge pull request #6 from jwiemers/redesign

Redesign
refactored count methods
refactored a lot of CSS Stuff & javascript, modified templates