cleaning again a bit the UI