fixed text input boxes
fixed nit
Merge remote-tracking branch 'origin/refactorStep1' into gh-pages