Refactor Number Control to look and behave like Date Control

Should resolve #216.