Minor adjustments to style and layout