fixed button text and modal not showing up correctly