Fix xhr
Separate bootstrap