add main menu
add tags display
Merge branch 'master' into controller