Added form for location
Deleted duplication
Added location