Bumped Bootstrap to v3.1.0, added TODOs