fixed issues with converting to Bootstrap 3