Fixed most fo the non visual issues
fixing Non Visual issues