Layout changes

and entry existence before deleting check