Preparing to Upgrade to Bootstrap 3 Pt. 2

Some things didn't commit last time for some weird reason.