Thanks Steven, you were right, those 2 changes fixed most of the problems. Now the only issue I have is showing the “field type” (http://awesomescreenshot.com/0221f23ca4)
Please advise. Thanks
