Tweak update badges some, still needs more work