close btn and swipe needs to be fixed.