Added a countdown timer and other enhancements