update templates
rename menu-* to navi-*
update for vote and bookmark
secure /admin