Fixed some bugs. Updated version of bootstrap