Bootstrap final version
More bootstrap 3 integration and fixes