Update fork with bootstrap 3