more bootstrap3 compatibility work