Layout tweaks for compose (experimental)