Beautified a little bit the UI