Added more data and formated modal