UI & minor under-the-hood changes