Added good images and did styling
Fixed merge conflicts