Layout fix for Nightly