Some styles added
refactoring
conflicts...
delete en cours...