UI modification
Merge et UI
Deliverable 2