refactored modal to use table cells
merge