Updated Buttons to work with deferred objects