Resolved github issues + optimization of images