Fix for correct HTML generation of menu