Improvements to menu template