Following his antics at the 'riff off', is Jordi a bit in the shade? Rhianna and Brooke give Tom a makeover. And Giles decides to get his own back on prefect Alex.