cleanup for web app navigation
Merge branch 'me#ex4'