Tweak wiki buttons, merge a few styles