fixed issues with button