Fixing Add New Unit feature