Change prediction time restrictions and UI changes, add user location
Last minute fixes and rushes