add textbox screen; clean up code; make naming consistent