Added days left counter and refactored routing