Added labels, formated result to short, made numeric input only