Refactor TextEntry - avoid using TextField::textTopMargin & background