Converted to new bootstrap and tightened up a bit