UI improvements
Oups forgotten that one