style updates for logo upload.

I think I fixed a merge conflict I inadvertently created. My apologies if it didn't get fixed quite right :)