Improved UI, prevent shell popup on command, handle duplicate events