Content and styling fixes