refactoring and update version of bootstrap to 3.1.0