Change some buttons to better buttons