refactored names, implemented add dialog