Added event stop propagation to unlinking modal event.
UI bug fixes and enhancements.