Definition UI improvements

Description

No description