Fixed merge conflict
Changed time to be a button