Fixing missing modal boxes #703 #704