Updated grid draw and fixed image download bug