Add menus

Almost ready, need testing on other machines