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