Should I use calatrava? Simple, clean and responsive first pass.

Also builds on previous pull request to fix margin funky-ness.