Refactor TextEntry - take 2