Updates à UI
Merge branch 'feature' into develop