Add numbers columns. Some UI changes