Various adjustments to style and layout