firefox css styling fix
Merge branch 'conversion' into testing