enhance edit and show