Bootstrap design improvements