Rafactor code so there is only one timer
Fix buttons