Improve Bootstrap