Add menu block tpl
Adjust logic