Buttons, a few UI rewamps