Fixed some stuff and added some buttons