Fix buggy buttons