Fix breakage in layout