Remove duplicated code
Improve the image look