Functional with bootstrap included and some other fixes