Fix layout to support Safari and Firefox