Fixed Bootstrap implementation