fix imports and modal