rearranged javascript.js and bootstrap