more fixes on add button