got rid of countdown. refactor in layout