Clean up positions and margins