[R2D] Layout fixes