Visit_Outlet and UnscheduledVisit merge

+ some cosmetic add