Added Text Fields and other fixes