Bootstrap improvements