Added namespace 'UIV' to avoid problems. Also fixed notifications and mode checking.