Fix z-index issue for Buttons