Consolidated and Simplified Input Focusing

Consolidated and simplified onEnter() method and added moveFocus() to
handle changing focus better.