Improved UI, Fixed Delete Bug