Adjust navigation menu
Add tags support