Fixed navigation bugs
Fixed field bugs