Cleanup and simplify navigation