Updated to Bootstrap v3 and made some minor modifications