redesign and a diet
more slimming
Merge pull request #1 from dettmer/redesign

Redesign