update on #107 and #105
update on #107 - Menu module bug