add edit option feature and minor changes