More updates to adapt to new Bootstrap version