Add images
Update css
Merge frontend
Fix conflict