Minor adjustments to the layout