Finished move to bootsrap 3.0