Add countdown feature and improved display logic