Code 'Add' function, minor tweak to UI
fix conflict