fixed buggy buttons