[R2D] Fixing Visual Layout issues