User interface tweaks
Fix problem catching overwrite and simplify usage