edit and index
fixed conflicts in index and edit
dropdown menu added
remove deleted files