For future PR's, I'd suggest landing buttons with the user-stories that activate them, mostly so that if we decide to not use those buttons, we don't end up with unused code lying around.  That said, i don't know that it's worth undoing your work here; if you want to leave this stuff in this time around, that's fine by me.