Fixed a few bugs

+ Upgraded Bootstrap to 2.3.1