Changes in the layout to make it a little bit more pleasant