Editing controls, adding buttons