Using ImageLoader
cleaned the code a ton
bunch of code fixes