fix block images
refactor