More content and style fixes