Re-add styles removed from bootstrap 3.0.0-rc.1
Simplify styling
Fix spacing