workshop improvments
Merge branch 'workshop_fixes' of github.com:yourdelivery/JigMagga into workshop_fixes