add number picker
Major code refactoring (MVC) part 1