update for jitsu
remove redundant var
rename var to match file name
highlight current page
more drawing