UI review
finalization for 2.2
Merge pull request #188 from baptistelebail/master

Finalization for 2.2