Adding back update button, and merging in fix for 1260