Close animation fix, vertical/horizontal scroll fix