better order
bit perfomance; better nav tree changhes order
Merge branch 'master' into chrome_popup