Bug Fixes

Try to fix the image problem, didn't work