Fix for add buttons