Added data types to modals, also alerts