fix import
Use ranged API call, minor UI improvements