Adapting to UI

Signed-off-by: Ludovic OLLAGNIER <ludovic@ollagnier.me>