Separate the buttons from core