added content to modals and reorganized