Improve CLI scaling experience

Closes #257
I did have that originally but it didn't feel right, not sure why though. Given you've mentioned it, I'll change it back.