Made adjustments to time zone & user view