Edit functionality finished