Added id's and adjusted countdown timer