Reverted to simple modal, with no explicit async loading