Hero and fade transitions working better