Added update info buttons (currently not working)
Merge remote-tracking branch 'origin/Tim-working'