Fixing button issues