Fixed issues with images