Issue #128: Restore much of functionality of "new" button