New ID calculation + UI fix