Overhaul UpdatePersonalInformation.java structure