Re #675 remove margins for declarer mode