Numerous fixes to style and content