Add jigsaw to webapp
Fix jigsaw for webapp