fixed menu / list nav problem

untabbed list sections to minimize merge changes
sorted out merge conflict