Latest modifications to the layout