Layout fixes to content