Fix the spinner (main site and it's wonkiness)

@jedp - could I get a quick review?

@jrgm - should we merge this into train-2013.05.08 as well?

fixes #3394