Detail fixes for the layout