did edit functionality, and wokring on javascript for edit ui
fixed merge errors