Add blocks around menu template items
Fix overflow issues in sidebar