fixes to the html template for the key and menu macros