Menu form fix #4