UI changes

Djibril last changes