simplified UI and refined labels