Make the checkout button selection smarter
Force z-index to 20000