bootstrap improvements