Dfoxpowell/modal refactor

@kylerush this should work now for all data attribute values