Adds TextField auto-sizing

Bonus: cleanup