Add refresh function, move number function to correct place