working to make add button working
Merge remote-tracking branch 'origin/master'