grabbed fixes to modal and data menu