Conditional Formating issue BY Date

Hello,
HI, I'm a little stuck, and help would be most helpful.

I have a range of cells $A$6:$O$53
Down the left are dates, past - present - future.

I want to colour the whole row if the date is either today or 30 days from todays date.
I think i have done it, but it is only turning the cell with the date RED and Not the the whole row?
I have done this...
Conditional formating, selected format only cells that contain.

In the format cells with section i have selected...
cell value between =$O$3 (which is a cell on the sheet with todays date) and =$O$4 (which is the date 30days from now)

But it only selects the date in the row and colours that and not the whole row.
Could you shed some light on this please.

Thank you for your time
Graham