Simplify navigation includes