Minor cleanup
Added stopwatch UI