The last corrections of the gui
Merge origin/master