fix for #12
fix for formatting on menu items
fix for menu items
fix #2