Gray background again
Wider staging area for better diff view