Remving duplication from the edit forms

Signed-off-by: Alan Gardner <alan@armoin.com>
Removing duplication from indexes

Signed-off-by: Alan Gardner <alan@armoin.com>