Replaced edit/save buttons with toggle button
Fixed line wrap on name field