Fixes to Fields View