fixing the fade ins and fade outs