Begin to fix image loading too slow