Update - edit mode working, still need to fix UI issue