Update to the new ui