fixed issues with buttons