Switch addInfo and addLayoutItems to use json_pack (cleaner code)