fixup buttons some more