fixed *margins corrections