Some redesign with Bootstrap