Added bootstrap.js + cleanup of main template