Refactor with images - phase 1
Refactor the box with images
Refactor the first page ok