Moved some things around

Also redid the updateNextScan logic. This allows for an actual
up-to-date display of how long there is until the next scan.