Add/Edit Menu option logic

# 77 tested and closed