images loading fixed and other small issues