Moved focus logic from Display to Input