Work further on default menu setup - Close #190