clean up in code
no location found fix and
margin fix