Minor tweaks to get menu showing properly.