added modals and restructuring data