Hacked in some more buttons