Fixes for vertical space issues in TextField