FIx validate & fix Viewer & update Shop