Some redesign with bootstrap