add css fixes and image changed
manual merge