Refactor navigation controls
Simplify fold level setting