fixing craft screen (WIP)
Merge branch 'origin/master'