#20 Have fixed formatting issues in Safari and Firefox