css improvements
new images
fix merge