new ghost-shield and margin fixes