more bootstrap3 refactoring