Fix layouts and add Modals to people