Minor adjustments to layout