More tweaking of the layout