Make buttnons look nice, fix up quoting