Better user dialogs && hot fix #15 #16