Added back a line of CSS that was causing bullets to appear in firefox.
Fixed merge conflict.