Fix null and [Add New] button