Some more improvements on the layout.