Changed background image
fixed merged issues