Fix code layout
Fix code layout for other vars
Merge branch 'master' into nav