Work on adding buttons