Fix layout errors from previous merge