Code cleanup, and add buttons to allow restarting timers when they've already been started