fixed menu / list nav problem

Let's try a merge