Fix update of person
Updated to use layouts, in order to avoid repetition