Fix navigation trim

Closes #612