Fix Firefox and Safari display issues. Closes #18