Amélioration UI mapping