fixed menu / list nav problem
fixed menu / list nav problem

untabbed list sections to minimize merge changes
sorted out merge conflict
re-added session stuff after rolling back
manual merge