Changes to fit to bootstrap 3