Fixes on buttons, although Buffer's is throwing console errors (╯°□°)╯︵ ┻━┻