Add menu helper macro and functions
Template menu fixes