Various additional layout and content fixes