Updated layout, content fixes.