inhanced edit UI