layout fixes, support for text fields