Fixing and adding buttons.