Rob's fixes for some more CSS issues