further cleaning settings dialog and stabilizing of custom event notification