action button and modal windows
conflict fix