change all loaders
add images for prev commit
fix conflicts