#26 Add New Button bug has been resolved