swaped bootstrap.js with ui.bootstrap.js

plus misc stuff