updated customer view to fix merge