Improved is method
Fix Swipe Panel bug