Fix location edit UI

Fixed location edit UI as requested.