Fixes drawGraph and add images