add support for multiple modals to be presented
clean up imports in .h files