Bugs on add button fixed