fix broken and fix for safari, still not rendering css properly in safari