Update Bootstrap and API improvements