[bundle] stopwatch and better layout