bugfix
start managing input type
code refactoring
code refactoring
+ checkbox