Fixed some buttons