Remove margins around zbox if the device height matches the zbox height
Fix remove margins code