some layout + content updates/fixes