Add/Create button improvement. Ref #48