Changed input screen to include time and distance picker