More layout changes and style fixes.