fix bug
fix bugs as loading images
rename image
Merge branch 'production'