added new button type 'saved' and 'savedDelete'
merged conflicts