changed some css and added placeholder image
fixed merges