adding buttons and renaming for consitency