[#933] Added location to update form
[#933] Update edit mode and small lay-out changes to update-main