Fixes for the layout.