adjusting css back to image-based, fix problems with FF rendering
Merge remote-tracking branch 'origin/master'