fix margin problem on servers
fix field names.