Fix some issues with the layout