More margin fixes. Finally bulletproof?