add new button and cleaned up api