Feature/editing

Need to make sure of the conflicts with Ari's scripts.js before merged