Buttons added along with timing functionality