Add pause/reset buttons and notifications. Code cleanup