Add ability to work without Custom Buttons