safari fixes and margin adjustment