Fix some layout issues and link wrapping