Fixing some bugs in navigation
Merge pull request #2984 from obrignoni/2.3/field-types

2.3/field types
Updating variables. Still needs work