Fixes for stuck modal and for button placement on live page